From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 11 Feb 2015 19:35:50 +0000 (+0100)
Subject: messageTray: Remove overlaid close button
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1708
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ec66b32df629321d0aa871a160d58ed0091be8d5;p=gnome-shell.git

messageTray: Remove overlaid close button

The new notification banner already includes a close button, so remove
the one provided by the tray.
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 18a1daf32..81d8412ad 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1499,11 +1499,6 @@ const MessageTray = new Lang.Class({
         this._banner = null;
         this._bannerClickedId = 0;
 
-        this._closeButton = Util.makeCloseButton();
-        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
-        this.actor.add_actor(this._closeButton);
-
         this._userActiveWhileNotificationShown = false;
 
         this.idleMonitor = Meta.IdleMonitor.get_core();
@@ -1529,7 +1524,6 @@ const MessageTray = new Lang.Class({
 
         Main.layoutManager.trayBox.add_actor(this.actor);
         Main.layoutManager.trackChrome(this.actor, { affectsInputRegion: true });
-        Main.layoutManager.trackChrome(this._closeButton);
 
         global.screen.connect('in-fullscreen-changed', Lang.bind(this, this._updateState));
 
@@ -1566,14 +1560,6 @@ const MessageTray = new Lang.Class({
         this._updateState();
     },
 
-    _closeNotification: function() {
-        if (this._notificationState == State.SHOWN) {
-            this._closeButton.hide();
-            this._notification.emit('done-displaying');
-            this._notification.destroy();
-        }
-    },
-
     get queueCount() {
         return this._notificationQueue.length;
     },
@@ -2038,7 +2024,6 @@ const MessageTray = new Lang.Class({
         if (notification.isTransient)
             notification.destroy(NotificationDestroyedReason.EXPIRED);
 
-        this._closeButton.hide();
         this._pointerInNotification = false;
         this._notificationRemoved = false;